bitkeeper revision 1.1396 (4277318fhBrWTxIQcLWvjKyF4aX-_w)
authorxenbk@gandalf.hpl.hp.com <xenbk@gandalf.hpl.hp.com>
Tue, 3 May 2005 08:08:47 +0000 (08:08 +0000)
committerxenbk@gandalf.hpl.hp.com <xenbk@gandalf.hpl.hp.com>
Tue, 3 May 2005 08:08:47 +0000 (08:08 +0000)
Merge

1  2 
.rootkeys
tools/python/xen/xend/XendDomain.py
tools/python/xen/xend/XendRoot.py

diff --cc .rootkeys
Simple merge
Simple merge
Simple merge